Added return 0 on success