removed so optomizations