cleaned up workings