fixed some things
Added new option of workspace