made it fully workable
