pulled changes, removed warnings