added lots and getting ready for fariba