tested stuff -> changes were made 'cause I made mistakes