Updated Master Template