First changes for 60000