Renamed files, added in provisions for discrete time