Added everything Adam already did