Projecto almost completed, optimization and some bug correction to be done