end properly
ocd
logic change