Updated date / optimized some shit