reformatted and added stuff