Laijoon

Sorry if some you are still waiting for an update to EIDS, I'll try my best to finish it..