Adds returns, refactors dropped