updated to use a mega
merged with uncomitted changes from dashboard machine