Changed some names - couldn't decide but happy now