Working on a buff routine