changes to support functions