Added aveilale functionality