Putting it all back after 3.0.3 update