changed method header signature
fixing new lines
merge with latest