adding avenue code
fix conflicts