Updated so everything has arguments and fitlers