Updated with methods on Swift