Changed to fit new methods in Character