add new classes
change draw logic