this is very disappointing... sorry, another commit. code OCD