seperate classes passed
fix names and commence to avoid ambiguity
merge