Trimmed down extra files from the simplified version