Moved local implementation to main sources #35