editing & added new stuff