updated and improved system modules