zara128 refactored