updated with current waazam version