added optimization (only works in regular right now...)