varias changes, totally customized for myself now