Alan (Rework)

Alan (Rework)