Made small changes, code macro movement next