Needs to find the better way