added stuff you asked for