Bug fixing and now with top feature