* Functions moved from one file to other in order to improve performance