First modifications to get going