Development #6

Added missing changes