Removed inheritance, worked on MDYP