removed funky stuff... needs cleanup