removed some functionality, debuggin.