Directory independant
Slimmed down