changed a coupla things