added mercury + some changes