Updates to reflect current working environment