Made changes based on my laptop