Removed old refs. and added new dev. approach