Working on billboard handling