working on changes
from lappy