Removed optimization for now