basic changes to keep it ready