Standby layer from Fredrick Norling added