added more lines but still not working properly