NOW EVERYTHING WORKS - every change from now in is optional :)