added all sprites nd got rid of conflicts