bug fixed + new style