Fixed Ceasar's issues