better way to manage it