about to add more logic