Added more animation and effect