finaly put things in order on development!