fixed, also changed names to be more friendly