Changed syntax to gain consistency