testing kinks & fix