Some formating and added GA