Good rework
Merge https://github.com/Zalastra/AbundantSpace