Reworked existing code related to /home