A little less code

a little more action please