Updated to latest patches and using Fragments