added more good code