Adjusted to our new code convention