fix stock, implements DateTime, loader duplication