minor changes from video/might not be correct