changed up format, much better