Updated/Fixed workspace