ready to merge
merge for details new style