fixed location, increased modularity