Working better, removed redundancy