Code working better