first commit of the day
finised 4-6 bug