added overriding feature, timestamps in files stay the same though, need to find solution
fixed the timing problem on the server side