Adding some custom bits