reverting the modularity - not working; will work on it later