make it work for 1 and 2