parameters redesigned. not quite what was planned though