bug fixing; date condition removed