Added updates from Osirsis and company