Fixed intent
Fixed import bug