Modified to my preferences