Adding some more custom bits