optimized shit
fixed message