changed up a bit
merge issue fixed