update cuke and view
merge with robert