dev parts optimized
working like a charm