#510 changes