using a better architecture now