Adding much better version of Inspector