Return expressions have been altered again, they seem to be working correctly now