minor changes, please ignore styles