commit problem 4 draft (still checking if it all works properly)