Update: Better performance and format