Reverting changes to previous merge

Undoing the changes from merge 8 and 16