more logic up
indenting