fixed bug!!! almost down with function one???