Changed/fixed based on #1