personal adjustments based on v1.0.5