loop support added