Updated Control Layer