System Tools added and fixed the code