Updated module, now works with live database