added some stuff - code is bugged