Modified Classes
solved merged conflict