just some updates.. not final because this isnt the right solution