cleaned up code

Included Pub which is needd for M7