Updated to more "proper" syntax