merge @niku's feedback