Changed implementation order