added more variations
updated to latest