maded changes based on the tutorial videos