updated to new cleaner format