some logic changes
mergin'