continuing to optimize
okay lets merge this