remove individual
fix date issue