Slight update to basic

removed unnecessary loops, added stop