meert1's changes