More customizations #33