Yep.... how it should be