Updated from working environment