Some finishing touches to finish this iteration