Added fixed and cleaned up