Update Aspect, add Calypso