opt attempt 2
fixes