Added trace and made pretty