Fixed General Errors
Added application passing to states