Updated to v1.3, added filters, reformatted