Changed Awwap functionality