Made various modifications to my liking