Changed syntax to be more efficient