lane's fixes