Swith to before because more efficient