I think this code is better...