Bringing inline with current changes