added update function / more customizations