Fixed working everything