rezn8d's changes merged