Updated with additional modules and fine tuned grid