Finish ticket 3

dont have time e...