modified
merge
pulled changes
added vendor methods