Added some advanced formatting