First complete version with building 5