more changes.... am for the win