#30 sync missed changes