Temp fix
Add start optimization