Some updated to how it works