Avalon Version2 Included

This is just extension of previous commit