update according to martin'suggestions