cleaned up inherrited code