Added a few play around stuff in 1.7