cleaned up with adviced #4