code and other stuff added